bitkeeper revision 1.1159.1.558 (42097caa-4C6IJxUdk1DgyyzixbYBg)
authoriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Wed, 9 Feb 2005 02:59:54 +0000 (02:59 +0000)
committeriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Wed, 9 Feb 2005 02:59:54 +0000 (02:59 +0000)
commita3736f5c0edc5907f33c51e370b53478a1b72508
tree580d7528626cf7ccdf342d2814a68f244c2e767d
parent29822cad4f28b830a68fc7288ecfaef16d4af71d
parent0eef50acd62083f9e80d45ae844940c9b2c5a4a0
bitkeeper revision 1.1159.1.558 (42097caa-4C6IJxUdk1DgyyzixbYBg)

Merge tetris.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into tetris.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c
linux-2.6.10-xen-sparse/arch/xen/i386/kernel/setup.c